From: Giuseppe Scrivano Date: Mon, 2 Mar 2015 10:39:51 +0000 (+0100) Subject: Makefile.dist-packaging: fix make rpm with submodules X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~884 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9843c4c2456b82b2bf857235e5b6e6460618a272;p=ostree.git Makefile.dist-packaging: fix make rpm with submodules Makefile.dist-packaging seems to assume to be run under packaging/ as "make -C packaging -f Makefile.dist-packaging rpm" so ensure the srcdir is set correctly to point to the parent directory. Signed-off-by: Giuseppe Scrivano --- diff --git a/packaging/Makefile.dist-packaging b/packaging/Makefile.dist-packaging index 103b1e8c..e1389ebd 100644 --- a/packaging/Makefile.dist-packaging +++ b/packaging/Makefile.dist-packaging @@ -3,7 +3,7 @@ GITREV = $$(git describe --always --tags) GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,') -srcdir=$(shell pwd) +srcdir=$(shell dirname `pwd`) PACKAGE=ostree PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG) @@ -30,4 +30,4 @@ srpm: dist-snapshot ./rpmbuild-cwd -bs $(PACKAGE).spec rpm: srpm - $(srcdir)/rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm + ./rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm